From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Fri, 1 Nov 2019 17:32:29 +0000 (+0100)
Subject: set-face-font doc string update
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~19^2~1170
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a8b87446656af0395864b7aaa697a4e04bcc1218;p=emacs.git

set-face-font doc string update

* lisp/faces.el (set-face-font): Mention what the string formats
are (bug#14647).
---

diff --git a/lisp/faces.el b/lisp/faces.el
index 2779197804b..75753ecefc9 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -888,6 +888,10 @@ Use `set-face-attribute' for finer control of font weight and slant."
 
 (defun set-face-font (face font &optional frame)
   "Change font-related attributes of FACE to those of FONT (a string).
+The format of the font varies based on the font system in used,
+but it can commonly be an X logical font description (XLFD)
+string, or a simpler XFD string like \"courier:size=10\".
+
 FRAME nil or not specified means change face on all frames.
 This sets the attributes `:family', `:foundry', `:width',
 `:height', `:weight', and `:slant'.  When called interactively,